Merge tag 'upstream/3.6.1_20160630'
authorGert Wollny <gw.fossdev@gmail.com>
Tue, 11 Oct 2016 20:08:26 +0000 (20:08 +0000)
committerGert Wollny <gw.fossdev@gmail.com>
Tue, 11 Oct 2016 20:08:26 +0000 (20:08 +0000)
Upstream version 3.6.1~20160630


Trivial merge